Autogenerated HTML docs for v1.7.4.1-343-ga91df
diff --git a/git-config.html b/git-config.html index c71b402..a6e67e8 100644 --- a/git-config.html +++ b/git-config.html
@@ -3247,10 +3247,10 @@ <dd> <p> Controls which merge resolution program is used by - <a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "kdiff3", - "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", - "diffuse", "ecmerge", "tortoisemerge", "p4merge", "araxis" and - "opendiff". Any other value is treated is custom merge tool + <a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "araxis", + "bc3", "diffuse", "ecmerge", "emerge", "gvimdiff", "kdiff3", "meld", + "opendiff", "p4merge", "tkdiff", "tortoisemerge", "vimdiff" + and "xxdiff". Any other value is treated is custom merge tool and there must be a corresponding mergetool.<tool>.cmd option. </p> </dd>
